[ADD] Support specifying a pin for merges #73
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
thomaspaulb
force-pushed
the
support-pinning
branch
from
d33c396
to
426fdfa
Compare
thomaspaulb
changed the title
thomaspaulb
changed the title
Codecov Report
@@ Coverage Diff @@
## master #73 +/- ##
==========================================
+ Coverage 82.64% 82.78% +0.14%
==========================================
Files 6 6
Lines 409 459 +50
==========================================
+ Hits 338 380 +42
- Misses 71 79 +8
|
|
Can you describe the use case? |
Ah, I now see this is #50 |
|
What happens if the target branch is rebased and thus the specified commit does not exist anymore on that branch? |
Then the build fails. |
…csone#28) Avoids also contacting twice (``fetch`` and then ``pull``) remote before merging. Signed-off-by: Valentin Lab <[email protected]>
thomaspaulb
force-pushed
the
support-pinning
branch
from
426fdfa
to
89db99c
Compare
I've updated the PR description to specify the use case, but it all becomes a bit thin if we are also allowed to query directly for the SHA. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Depends on:
Use case:
Currently in gitaggregator, you can already do:
With this change, you can specify the exact branches on which the commits are and do:
So that
fetch_all = Trueis not needed anymore and just the branches need to be fetched, and then reset to the pinned commit.NB: I notice that Github currently also accept querying directly for the SHA. Is that new? Eg just this also works: